Riding Waves To Find The Boat